From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 17 Sep 2018 10:56:37 +0000 (+0200)
Subject: fileUtils: Fix fallback code for old gjs
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~929^2^2~37
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2ed6290a40af124cd4aac5494173e98c19b3d2d6;p=gnome-shell.git

fileUtils: Fix fallback code for old gjs

gjs's D-Bus convenience explicitly expects a string representation
of an interface, but the new convenience method to load an XML
description from a resource introduced in commit f42d9df3e0 only
returns a string when using gjs from the GNOME 3.30 release. We
have so far managed to keep compatibility with the previous stable
gjs release, so fix up the fallback code to cast to string.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/578
---

diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index 81cd92c94..24add2e7e 100644
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -90,7 +90,7 @@ function loadInterfaceXML(iface) {
         if (bytes instanceof Uint8Array)
             xml = imports.byteArray.toString(bytes)
         else
-            xml = bytes;
+            xml = bytes.toString();
     } catch (e) {
         log('Failed to load D-Bus interface ' + iface);
     }